diff --git a/application/controllers/Gridmap.php b/application/controllers/Gridmap.php
index 075906269..922e987c2 100644
--- a/application/controllers/Gridmap.php
+++ b/application/controllers/Gridmap.php
@@ -173,7 +173,7 @@ class Gridmap extends CI_Controller {
 			}
 		}
 
-        $data['grid_2char_confirmed'] = ($array_grid_2char_confirmed);
+		$data['grid_2char_confirmed'] = ($array_grid_2char_confirmed);
 		$data['grid_4char_confirmed'] = ($array_grid_4char_confirmed);
 		$data['grid_6char_confirmed'] = ($array_grid_6char_confirmed);
 
diff --git a/application/models/Gridmap_model.php b/application/models/Gridmap_model.php
index 067545c3a..98bd829c1 100644
--- a/application/models/Gridmap_model.php
+++ b/application/models/Gridmap_model.php
@@ -129,6 +129,7 @@ class Gridmap_model extends CI_Model {
             return null;
         }
 
+
 		$location_list = "'".implode("','",$logbooks_locations_array)."'";
 
 		$sql = 'SELECT distinct COL_VUCC_GRIDS, COL_BAND FROM '
@@ -177,7 +178,10 @@ class Gridmap_model extends CI_Model {
 		    $sql .= " or col_qrzcom_qso_download_status = 'Y'";
 	    }
 	    if ($sql != '') {
-		    $sql='and (1=0 '.$sql.')';
+		    $sql=' and (1=0 '.$sql.')';
+	    }
+	    if ($sql == '') {
+		    $sql=' and 1=0';
 	    }
 	    return $sql;
     }
diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js
index 87a371e0f..a89f8729c 100644
--- a/assets/js/sections/bandmap_list.js
+++ b/assets/js/sections/bandmap_list.js
@@ -56,7 +56,7 @@ $(function() {
 						} else if (single.worked_dxcc) {
 							dxcc_wked_info="text-warning";
 						} else {
-							dxcc_wked_info="";
+							dxcc_wked_info="text-danger";
 						}
 						if (single.cnfmd_call) {
 							wked_info="text-success";
@@ -86,7 +86,7 @@ $(function() {
 						spotted=wked_info+lotw_badge;
 						data[0].push(spotted);
 						if (single.dxcc_spotted.flag) {
-							dxcc_wked_info=((dxcc_wked_info != '' ?'<span class="'+dxcc_wked_info+'">' : '')+single.dxcc_spotted.entity+' '+single.dxcc_spotted.flag+(dxcc_wked_info != '' ? '</span>' : ''));
+							dxcc_wked_info=((dxcc_wked_info != '' ?'<span class="'+dxcc_wked_info+'">' : '')+single.dxcc_spotted.flag+' '+single.dxcc_spotted.entity+(dxcc_wked_info != '' ? '</span>' : ''));
 							data[0].push('<a href="javascript:spawnLookupModal(\''+single.dxcc_spotted.dxcc_id+'\',\'dxcc\')";>'+dxcc_wked_info+'</a>');
 						} else {
 							data[0].push('<a href="javascript:spawnLookupModal(\''+single.dxcc_spotted.dxcc_id+'\',\'dxcc\')";>'+single.dxcc_spotted.entity+'</a>');