diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index dd0bd5e2..54e35b5b 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -387,8 +387,9 @@ class Logbook_model extends CI_Model {
 			$this->db->where('COL_DARC_DOK', $searchphrase);
 			break;
 		case 'WAJA':
-			$this->db->where('COL_STATE', $searchphrase);
-			$this->db->where_in('COL_DXCC', ['339']);
+			$state = str_pad($searchphrase, 2, '0', STR_PAD_LEFT);
+			$this->db->where('COL_STATE', $state);
+			$this->db->where('COL_DXCC', '339');
 			break;
 		case 'QSLRDATE':
 			$this->db->where('date(COL_QSLRDATE)=date(SYSDATE())');
diff --git a/assets/js/sections/wajamap.js b/assets/js/sections/wajamap.js
index 8988f680..ed871d64 100644
--- a/assets/js/sections/wajamap.js
+++ b/assets/js/sections/wajamap.js
@@ -172,7 +172,7 @@ for (var i = 0; i < prefectures.length; i++) {
 			  color: mapColor,
 			  strokeOpacity: 0.3,
 			  strokeWeight: 2,
-			  title: i,
+			  title: i+1,
 	  }).addTo(map).on('click', onClick);
 		// }).bindLabel(prefectureinfo[i]).addTo(map).on('click', onClick);