diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php
index 09faebd9..a75479a9 100644
--- a/application/controllers/Dashboard.php
+++ b/application/controllers/Dashboard.php
@@ -159,21 +159,18 @@ class Dashboard 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\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
-					$count++;
 				}
+
+				$result = $this->logbook_model->dxcc_lookup($row->COL_CALL, $row->COL_TIME_ON);
+		
+				if(isset($result)) {
+					$lat = $result['lat'];
+					$lng = $result['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: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
+				$count++;
 			}
 
 		}
diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index a2c94ec4..d4ce1677 100755
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -372,6 +372,7 @@ class Logbook extends CI_Controller {
 
 	/* Used to generate maps for displaying on /logbook/ */
 	function qso_map() {
+		header('Content-Type: application/json; charset=utf-8');
 		$this->load->model('logbook_model');
 
 		$this->load->library('qra');
@@ -433,21 +434,18 @@ class Logbook 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\":\"".$dxcc->lat."\",\"lng\":\"".$dxcc->long."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
-					$count++;
 				}
+
+				$result = $this->logbook_model->dxcc_lookup($row->COL_CALL, $row->COL_TIME_ON);
+		
+				if(isset($result)) {
+					$lat = $result['lat'];
+					$lng = $result['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: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
+				$count++;
 			}
 
 		}