diff --git a/application/controllers/Gridmap.php b/application/controllers/Gridmap.php
index 07590626..922e987c 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 067545c3..0e38a3be 100644
--- a/application/models/Gridmap_model.php
+++ b/application/models/Gridmap_model.php
@@ -13,6 +13,10 @@ class Gridmap_model extends CI_Model {
             return null;
         }
 
+        if ($lotw != "true" && $qsl != "true" && $eqsl != "true" && $qrz != "true") {
+           return null;
+        }
+
 		$location_list = "'".implode("','",$logbooks_locations_array)."'";
 
 		$sql = 'SELECT distinct substring(COL_GRIDSQUARE,1,6) as GRID_SQUARES, COL_BAND FROM '
@@ -129,6 +133,11 @@ class Gridmap_model extends CI_Model {
             return null;
         }
 
+
+        if ($lotw != "true" && $qsl != "true" && $eqsl != "true" && $qrz != "true") {
+           return null;
+        }
+
 		$location_list = "'".implode("','",$logbooks_locations_array)."'";
 
 		$sql = 'SELECT distinct COL_VUCC_GRIDS, COL_BAND FROM '