diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php
index b23b5d11f..1cd9c8fc3 100644
--- a/application/controllers/Awards.php
+++ b/application/controllers/Awards.php
@@ -297,7 +297,7 @@ class Awards extends CI_Controller {
             $postdata['qrz'] = 0;
             $postdata['worked'] = 1;
             $postdata['confirmed'] = 1;
-            $postdata['notworked'] = 1;
+            $postdata['notworked'] = 0;
             $postdata['includedeleted'] = 0;
             $postdata['Africa'] = 1;
             $postdata['Asia'] = 1;
diff --git a/application/models/Jcc.php b/application/models/Jcc.php
index c2ad90590..535cd39dc 100644
--- a/application/models/Jcc.php
+++ b/application/models/Jcc.php
@@ -857,14 +857,14 @@ class Jcc extends CI_Model {
 			if ($postdata['worked'] != NULL) {
 				$jccBand = $this->getJccWorked($location_list, $band, $postdata);
 				foreach ($jccBand as $line) {
-					$bandJcc[$line->col_cnty][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("' . $line->col_cnty . '","' . $band . '","'. $postdata['mode'] . '","WAJA", "")\'>W</a></div>';
+					$bandJcc[$line->col_cnty][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("' . $line->col_cnty . '","' . $band . '","'. $postdata['mode'] . '","JCC", "")\'>W</a></div>';
 					$cities[$line->col_cnty]['count']++;
 				}
 			}
 			if ($postdata['confirmed'] != NULL) {
 				$jccBand = $this->getJccConfirmed($location_list, $band, $postdata);
 				foreach ($jccBand as $line) {
-					$bandJcc[$line->col_cnty][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . $line->col_cnty . '","' . $band . '","'. $postdata['mode'] . '","WAJA", "'.$qsl.'")\'>C</a></div>';
+					$bandJcc[$line->col_cnty][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . $line->col_cnty . '","' . $band . '","'. $postdata['mode'] . '","JCC", "'.$qsl.'")\'>C</a></div>';
 					$cities[$line->col_cnty]['count']++;
 				}
 			}
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 4b75642ad..0d72429d4 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -380,10 +380,14 @@ class Logbook_model extends CI_Model {
 			$this->db->where('COL_STATE', $searchphrase);
 			$this->db->where_in('COL_DXCC', ['1']);
 			break;
-    case 'helvetia':
-      $this->db->where('COL_STATE', $searchphrase);
-      $this->db->where_in('COL_DXCC', ['287']);
-      break;
+		case 'helvetia':
+			$this->db->where('COL_STATE', $searchphrase);
+			$this->db->where_in('COL_DXCC', ['287']);
+			break;
+		case 'JCC':
+			$this->db->where('COL_CNTY', $searchphrase);
+			$this->db->where('COL_DXCC', '339');
+			break;
 		case 'SOTA':
 			$this->db->where('COL_SOTA_REF', $searchphrase);
 			break;
diff --git a/application/views/awards/jcc/index.php b/application/views/awards/jcc/index.php
index 9e02bc161..ba516ed35 100644
--- a/application/views/awards/jcc/index.php
+++ b/application/views/awards/jcc/index.php
@@ -1,55 +1,3 @@
-<script>
-	var tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"
-</script>
-
-<style>
-    #wajamap {
-	height: calc(100vh - 500px) !important;
-	max-height: 900px !important;
-}
-/*Legend specific*/
-.legend {
-  padding: 6px 8px;
-  font: 14px Arial, Helvetica, sans-serif;
-  background: white;
-  background: rgba(255, 255, 255, 0.8);
-  line-height: 24px;
-  color: #555;
-}
-.legend h4 {
-  text-align: center;
-  font-size: 16px;
-  margin: 2px 12px 8px;
-  color: #555;
-}
-.legend span {
-  position: relative;
-  bottom: 3px;
-  color: #555;
-}
-.legend i {
-  width: 18px;
-  height: 18px;
-  float: left;
-  margin: 0 8px 0 0;
-  opacity: 0.7;
-  color: #555;
-}
-
-.info {
-    padding: 6px 8px;
-    font: 14px/16px Arial, Helvetica, sans-serif;
-    background: white;
-    background: rgba(255,255,255,0.8);
-    box-shadow: 0 0 15px rgba(0,0,0,0.2);
-    border-radius: 5px;
-	color: #555;
-}
-.info h4 {
-    margin: 0 0 5px;
-    color: #555;
-}
-</style>
 <div class="container">
         <!-- Award Info Box -->
         <br>
@@ -81,7 +29,7 @@
                         <label class="form-check-label" for="confirmed">Show confirmed</label>
                     </div>
                     <div class="form-check-inline">
-                        <input class="form-check-input" type="checkbox" name="notworked" id="notworked" value="1" <?php if ($this->input->post('notworked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
+                        <input class="form-check-input" type="checkbox" name="notworked" id="notworked" value="1" <?php if ($this->input->post('notworked')) echo ' checked="checked"'; ?> >
                         <label class="form-check-label" for="notworked">Show not worked</label>
                     </div>
                 </div>
@@ -150,9 +98,6 @@
                 <div class="col-md-10">
                     <button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning">Reset</button>
                     <button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary">Show</button>
-                    <?php if ($jcc_array) {
-                        ?><button type="button" onclick="load_waja_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-americas"></i> Show WAJA Map</button>
-                    <?php }?>
                 </div>
             </div>
 
@@ -161,19 +106,12 @@
 
     <ul class="nav nav-tabs" id="myTab" role="tablist">
         <li class="nav-item">
-            <a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true">Table</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" id="map-tab" onclick="load_waja_map();" data-bs-toggle="tab" href="#wajamaptab" role="tab" aria-controls="home" aria-selected="false">Map</a>
+            <a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true">Results</a>
         </li>
     </ul>
     <br />
 
     <div class="tab-content" id="myTabContent">
-        <div class="tab-pane fade" id="wajamaptab" role="tabpanel" aria-labelledby="home-tab">
-    <br />
-
-    <div id="wajamap" class="map-leaflet" ></div>
 
     </div>
 
@@ -187,7 +125,7 @@
                     <thead>
                     <tr>
 						<td>Number</td>
-						<td>Prefecture</td>';
+						<td>City</td>';
 
         foreach($bands as $band) {
             echo '<td>' . $band . '</td>';