diff --git a/application/views/bandmap/list.php b/application/views/bandmap/list.php
index d7507dd6b..97f1f51a1 100644
--- a/application/views/bandmap/list.php
+++ b/application/views/bandmap/list.php
@@ -76,9 +76,10 @@
 			<label class="my-1 me-2" for="cwnSelect"><?= __("DXCC-Status"); ?></label>
 			<select class="form-select form-select-sm my-1 me-sm-2 w-auto" id="cwnSelect" name="dxcluster_cwn" aria-describedby="dxcluster_cwnHelp" required>
 				<option value="All"><?= __("All"); ?></option>
+				<option value="notwkd"><?= __("Not worked"); ?></option>
 				<option value="wkd"><?= __("Worked"); ?></option>
 				<option value="cnf"><?= __("Confirmed"); ?></option>
-				<option value="ucnf"><?= __("Not Confirmed"); ?></option>
+				<option value="ucnf"><?= __("Worked, not Confirmed"); ?></option>
 			</select>
 			<label class="my-1 me-2" for="decontSelect"><?= __("Spots de"); ?></label>
 			<select class="form-select form-select-sm my-1 me-sm-2 w-auto" id="decontSelect" name="dxcluster_decont" aria-describedby="dxcluster_decontHelp" required>
diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js
index ec2bc9508..73535a916 100644
--- a/assets/js/sections/bandmap_list.js
+++ b/assets/js/sections/bandmap_list.js
@@ -53,9 +53,10 @@ $(function() {
 				if (dxspots.length>0) {
 					dxspots.sort(SortByQrg);
 					dxspots.forEach((single) => {
+						if ((cwn == 'notwkd') && ((single.worked_dxcc))) { return; }
 						if ((cwn == 'wkd') && (!(single.worked_dxcc))) { return; }
 						if ((cwn == 'cnf') && (!(single.cnfmd_dxcc))) { return; }
-						if ((cwn == 'ucnf') && ((single.cnfmd_dxcc))) { return; }
+						if ((cwn == 'ucnf') && (!(single.worked_dxcc) || single.cnfmd_dxcc)) { return; }
 						spots2render++;
 						var data=[];
 						if (single.cnfmd_dxcc) {