diff --git a/application/controllers/Visitor.php b/application/controllers/Visitor.php
index 5d4c2f33..35ed1198 100644
--- a/application/controllers/Visitor.php
+++ b/application/controllers/Visitor.php
@@ -214,23 +214,19 @@ class Visitor extends CI_Controller {
 				$count++;
 		
 			} else {
-				$query = $this->db->query('
-					SELECT *
-					FROM dxcc_entities
-					WHERE prefix = SUBSTRING( \''.$row->COL_CALL.'\', 1, LENGTH( prefix ) )
-					ORDER BY LENGTH( prefix ) DESC
-					LIMIT 1 
-				');
-
-				foreach ($query->result() as $dxcc) {
-					if($count != 1) {
+				if($count != 1) {
 					echo ",";
-						}
-					echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ";
-					echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
-					echo "\",\"label\":\"".$row->COL_CALL."\"}";
-					$count++;
 				}
+
+				if(isset($row->lat) && isset($row->long)) {
+					$lat = $row->lat;
+					$lng = $row->long;
+				}
+
+				echo "{\"lat\":\"".$lat."\",\"lng\":\"".$lng."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ";
+				echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
+				echo "\",\"label\":\"".$row->COL_CALL."\"}";
+				$count++;
 			}
 
 		}