diff --git a/application/models/Api_model.php b/application/models/Api_model.php
index e1a29b1f..f5e38353 100644
--- a/application/models/Api_model.php
+++ b/application/models/Api_model.php
@@ -41,10 +41,18 @@ class API_Model extends CI_Model {
 
     function country_worked($dxcc_num, $band, $mode){
 
-    	if($mode != NULL) {
-    		$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_DXCC = "'.$dxcc_num.'" AND COL_BAND = "'.$band.'" AND COL_MODE = "'.$mode.'"');
+    	if($band == "all") {
+    		if($mode != NULL) {
+	    		$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_DXCC = "'.$dxcc_num.'" AND COL_MODE = "'.$mode.'"');
+	    	} else {
+	    		$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_DXCC = "'.$dxcc_num.'"');
+	    	}
     	} else {
-    		$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_DXCC = "'.$dxcc_num.'" AND COL_BAND = "'.$band.'"');
+	    	if($mode != NULL) {
+	    		$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_DXCC = "'.$dxcc_num.'" AND COL_BAND = "'.$band.'" AND COL_MODE = "'.$mode.'"');
+	    	} else {
+	    		$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_DXCC = "'.$dxcc_num.'" AND COL_BAND = "'.$band.'"');
+	    	}
     	}
 
     	if ($query->num_rows() > 0)
@@ -59,10 +67,18 @@ class API_Model extends CI_Model {
 
     function gridsquare_worked($gridsquare, $band, $mode){
 
-    	if($mode != NULL) {
-    		$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" AND COL_BAND = "'.$band.'" AND COL_MODE = "'.$mode.'"');
+    	if($band == "all") {
+			if($mode != NULL) {
+	    		$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" AND COL_MODE = "'.$mode.'"');
+	    	} else {
+	    		$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_GRIDSQUARE LIKE "%'.$gridsquare.'%"');
+	    	}
     	} else {
-    		$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" AND COL_BAND ="'.$band.'"');
+			if($mode != NULL) {
+	    		$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" AND COL_BAND = "'.$band.'" AND COL_MODE = "'.$mode.'"');
+	    	} else {
+	    		$query = $this->db->query('SELECT COUNT(1) as count FROM '.$this->config->item('table_name').' WHERE COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" AND COL_BAND ="'.$band.'"');
+	    	}
     	}
 
     	if ($query->num_rows() > 0)