diff --git a/application/config/migration.php b/application/config/migration.php
index 82b16eba..a6519c61 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE;
 |
 */
 
-$config['migration_version'] = 165;
+$config['migration_version'] = 166;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index b515fdb8..3bf881aa 100644
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -209,7 +209,7 @@ class Logbook extends CI_Controller {
 		if(!empty($logbooks_locations_array)) {
 			$extrawhere='';
 			if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
-				$extrawhere="COL_QSL_RCVD='Y'"; 
+				$extrawhere="COL_QSL_RCVD='Y'";
 			}
 			if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
 				if ($extrawhere!='') {
@@ -336,10 +336,10 @@ class Logbook extends CI_Controller {
 			$return['workedBefore'] = true;
 		}
 
-		
+
 		$extrawhere='';
 		if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
-			$extrawhere="COL_QSL_RCVD='Y'"; 
+			$extrawhere="COL_QSL_RCVD='Y'";
 		}
 		if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
 			if ($extrawhere!='') {
@@ -427,7 +427,7 @@ class Logbook extends CI_Controller {
 
 			$extrawhere='';
 			if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
-				$extrawhere="COL_QSL_RCVD='Y'"; 
+				$extrawhere="COL_QSL_RCVD='Y'";
 			}
 			if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
 				if ($extrawhere!='') {
@@ -528,7 +528,7 @@ class Logbook extends CI_Controller {
 
 			$extrawhere='';
 			if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
-				$extrawhere="COL_QSL_RCVD='Y'"; 
+				$extrawhere="COL_QSL_RCVD='Y'";
 			}
 			if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
 				if ($extrawhere!='') {
@@ -683,7 +683,7 @@ class Logbook extends CI_Controller {
 
 		}
 		echo "]";
-		
+
 		// [MAP Custom] ADD Station //
 		$this->load->model('Stations');
 		$station_json = $this->Stations->get_station_json_for_map();
@@ -737,12 +737,13 @@ class Logbook extends CI_Controller {
 
 			$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
 			$this->db->where_in('station_profile.station_id', $logbooks_locations_array);
-			$this->db->order_by(''.$this->config->item('table_name').'.COL_TIME_ON', "desc");
 
+			$this->db->group_start();
 			$this->db->where($this->config->item('table_name').'.COL_CALL', $id);
 			$this->db->or_like($this->config->item('table_name').'.COL_CALL', '/'.$id,'before');
 			$this->db->or_like($this->config->item('table_name').'.COL_CALL', $id.'/','after');
 			$this->db->or_like($this->config->item('table_name').'.COL_CALL', '/'.$id.'/');
+			$this->db->group_end();
 
 			$this->db->order_by($this->config->item('table_name').".COL_TIME_ON", "desc");
 			$this->db->limit(5);
diff --git a/application/controllers/Options.php b/application/controllers/Options.php
index 4a9ea734..a81a8865 100644
--- a/application/controllers/Options.php
+++ b/application/controllers/Options.php
@@ -338,6 +338,8 @@ class Options extends CI_Controller {
 
 		$global_oqrs_text = $this->optionslib->update('groupedSearch', $this->input->post('groupedSearch'), null);
 
+		$global_oqrs_text = $this->optionslib->update('groupedSearchShowStationName', $this->input->post('groupedSearchShowStationName'), null);
+
 		if($global_oqrs_text == TRUE) {
 			$this->session->set_flashdata('success', $this->lang->line('options_oqrs_options_have_been_saved'));
 		}
diff --git a/application/language/bulgarian/options_lang.php b/application/language/bulgarian/options_lang.php
index adcb9bbb..837fe329 100644
--- a/application/language/bulgarian/options_lang.php
+++ b/application/language/bulgarian/options_lang.php
@@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text';
 $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.';
 $lang['options_grouped_search'] = 'Grouped search';
 $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.';
+$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results";
+$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table.";
 $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.';
 
 $lang['options_dxcluster'] = 'DXCluster';
diff --git a/application/language/chinese_simplified/options_lang.php b/application/language/chinese_simplified/options_lang.php
index 0cd60bda..76be657d 100644
--- a/application/language/chinese_simplified/options_lang.php
+++ b/application/language/chinese_simplified/options_lang.php
@@ -58,6 +58,8 @@ $lang['options_global_text'] = '全局文本';
 $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = '该文本是一个可选文本，可以显示在OQRS页面的顶部。';
 $lang['options_grouped_search'] = '分组搜索';
 $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = '当此选项打开时，所有具有OQRS活动的电台位置将同时搜索。';
+$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results";
+$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table.";
 $lang['options_oqrs_options_have_been_saved'] = 'OQRS选项已保存';
 
 $lang['options_save'] = '保存';
diff --git a/application/language/czech/options_lang.php b/application/language/czech/options_lang.php
index d0ab2fc0..b1bde503 100644
--- a/application/language/czech/options_lang.php
+++ b/application/language/czech/options_lang.php
@@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Globální text';
 $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'Tento text je nepovinný text, který lze zobrazit na horní části stránky OQRS.';
 $lang['options_grouped_search'] = 'Seskupené vyhledávání';
 $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'Když je tato možnost zapnutá, budou všechny stanice s aktivním OQRS vyhledávány najednou.';
+$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results";
+$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table.";
 $lang['options_oqrs_options_have_been_saved'] = 'Možnosti OQRS byly uloženy.';
 
 $lang['options_dxcluster'] = 'DXCluster';
diff --git a/application/language/dutch/options_lang.php b/application/language/dutch/options_lang.php
index fa5c9b6d..c26ac382 100644
--- a/application/language/dutch/options_lang.php
+++ b/application/language/dutch/options_lang.php
@@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text';
 $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.';
 $lang['options_grouped_search'] = 'Grouped search';
 $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.';
+$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results";
+$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table.";
 $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.';
 
 $lang['options_dxcluster'] = 'DXCluster';
diff --git a/application/language/english/options_lang.php b/application/language/english/options_lang.php
index 4f05c772..a4f8b3cd 100644
--- a/application/language/english/options_lang.php
+++ b/application/language/english/options_lang.php
@@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text';
 $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.';
 $lang['options_grouped_search'] = 'Grouped search';
 $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.';
+$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results";
+$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table.";
 $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.';
 
 $lang['options_dxcluster'] = 'DXCluster';
diff --git a/application/language/finnish/options_lang.php b/application/language/finnish/options_lang.php
index 4e026c4f..ce1763c6 100644
--- a/application/language/finnish/options_lang.php
+++ b/application/language/finnish/options_lang.php
@@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text';
 $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.';
 $lang['options_grouped_search'] = 'Grouped search';
 $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.';
+$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results";
+$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table.";
 $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.';
 
 $lang['options_dxcluster'] = 'DXCluster';
diff --git a/application/language/french/options_lang.php b/application/language/french/options_lang.php
index 4f05c772..a4f8b3cd 100644
--- a/application/language/french/options_lang.php
+++ b/application/language/french/options_lang.php
@@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text';
 $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.';
 $lang['options_grouped_search'] = 'Grouped search';
 $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.';
+$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results";
+$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table.";
 $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.';
 
 $lang['options_dxcluster'] = 'DXCluster';
diff --git a/application/language/german/options_lang.php b/application/language/german/options_lang.php
index 3360d963..c6055f53 100644
--- a/application/language/german/options_lang.php
+++ b/application/language/german/options_lang.php
@@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Globaler Text';
 $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'Dies ist ein optionaler Text, der auf oben auf der OQRS Seite angezeigt werden kann.';
 $lang['options_grouped_search'] = 'Gruppierte Suche';
 $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'Wenn aktiviert, werden alle Stationsstandorte auf einmal durchsucht.';
+$lang['options_grouped_search_show_station_name'] = "Zeige den Name des Stationsstandorts in der gruppierten Suche";
+$lang['options_grouped_search_show_station_name_hint'] = "Wenn die gruppierte Suche eingeschaltet ist, kannst du hier entscheiden, ob der Name des Stationsstandortes in der Ergebnistabelle gezeigt werden soll oder nicht.";
 $lang['options_oqrs_options_have_been_saved'] = 'OQRS Einstellungen wurden gespeichert.';
 
 $lang['options_dxcluster'] = 'DXCluster';
diff --git a/application/language/greek/options_lang.php b/application/language/greek/options_lang.php
index 4f05c772..a4f8b3cd 100644
--- a/application/language/greek/options_lang.php
+++ b/application/language/greek/options_lang.php
@@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text';
 $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.';
 $lang['options_grouped_search'] = 'Grouped search';
 $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.';
+$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results";
+$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table.";
 $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.';
 
 $lang['options_dxcluster'] = 'DXCluster';
diff --git a/application/language/italian/options_lang.php b/application/language/italian/options_lang.php
index 4f05c772..a4f8b3cd 100644
--- a/application/language/italian/options_lang.php
+++ b/application/language/italian/options_lang.php
@@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text';
 $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.';
 $lang['options_grouped_search'] = 'Grouped search';
 $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.';
+$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results";
+$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table.";
 $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.';
 
 $lang['options_dxcluster'] = 'DXCluster';
diff --git a/application/language/polish/options_lang.php b/application/language/polish/options_lang.php
index 4f05c772..a4f8b3cd 100644
--- a/application/language/polish/options_lang.php
+++ b/application/language/polish/options_lang.php
@@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text';
 $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.';
 $lang['options_grouped_search'] = 'Grouped search';
 $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.';
+$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results";
+$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table.";
 $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.';
 
 $lang['options_dxcluster'] = 'DXCluster';
diff --git a/application/language/russian/options_lang.php b/application/language/russian/options_lang.php
index e2469959..9c881978 100644
--- a/application/language/russian/options_lang.php
+++ b/application/language/russian/options_lang.php
@@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Сообщение на странице OQRS';
 $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'Необязательный текст, который может быть отображён в верхней части страницы OQRS.';
 $lang['options_grouped_search'] = 'Объединённый поиск';
 $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'Если включено, то поиск будет осуществляться во всех местоположениях станций, где активен OQRS.';
+$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results";
+$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table.";
 $lang['options_oqrs_options_have_been_saved'] = 'Настройки OQRS сохранены.';
 
 $lang['options_dxcluster'] = 'DXCluster';
diff --git a/application/language/spanish/options_lang.php b/application/language/spanish/options_lang.php
index 4f05c772..a4f8b3cd 100644
--- a/application/language/spanish/options_lang.php
+++ b/application/language/spanish/options_lang.php
@@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text';
 $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.';
 $lang['options_grouped_search'] = 'Grouped search';
 $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.';
+$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results";
+$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table.";
 $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.';
 
 $lang['options_dxcluster'] = 'DXCluster';
diff --git a/application/language/swedish/options_lang.php b/application/language/swedish/options_lang.php
index 0190786f..4003275f 100644
--- a/application/language/swedish/options_lang.php
+++ b/application/language/swedish/options_lang.php
@@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text';
 $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'Denna text är en valfri text som kan visas överst på OQRS-sidan.';
 $lang['options_grouped_search'] = 'Grupperad sökning';
 $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'När detta är på kommer alla stationsplatser med OQRS aktiv att sökas på en gång.';
+$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results";
+$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table.";
 $lang['options_oqrs_options_have_been_saved'] = 'OQRS-alternativ har sparats.';
 
 $lang['options_dxcluster'] = 'DXCluster';
diff --git a/application/language/turkish/options_lang.php b/application/language/turkish/options_lang.php
index 4f05c772..a4f8b3cd 100644
--- a/application/language/turkish/options_lang.php
+++ b/application/language/turkish/options_lang.php
@@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text';
 $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.';
 $lang['options_grouped_search'] = 'Grouped search';
 $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.';
+$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results";
+$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table.";
 $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.';
 
 $lang['options_dxcluster'] = 'DXCluster';
diff --git a/application/migrations/166_set_oqrs_stationname_option.php b/application/migrations/166_set_oqrs_stationname_option.php
new file mode 100644
index 00000000..0a798fe7
--- /dev/null
+++ b/application/migrations/166_set_oqrs_stationname_option.php
@@ -0,0 +1,20 @@
+<?php
+
+defined('BASEPATH') or exit('No direct script access allowed');
+
+/*
+*   Create a dxpedition table
+*/
+
+class Migration_set_oqrs_stationname_option extends CI_Migration
+{
+    public function up()
+    {
+		$this->db->query("INSERT INTO options (option_name, option_value, autoload) SELECT DISTINCT 'groupedSearchShowStationName', 'on', NULL FROM options WHERE NOT EXISTS (SELECT 1 FROM options WHERE option_name = 'groupedSearchShowStationName');");
+    }
+
+    public function down()
+    {
+		$this->db->query("DELETE FROM options WHERE option_name = 'groupedSearchShowStationName';");
+    }
+}
diff --git a/application/views/bandmap/list.php b/application/views/bandmap/list.php
index 1c2a115e..4fbebb89 100644
--- a/application/views/bandmap/list.php
+++ b/application/views/bandmap/list.php
@@ -18,6 +18,8 @@
     -moz-transition: all 15s ease;
     -o-transition: all 15s ease;
     transition: all 15s ease;
+    --bs-table-bg: #5dade2;
+    --bs-table-accent-bg: #5dade2;
 }
 </style>
 
diff --git a/application/views/options/oqrs.php b/application/views/options/oqrs.php
index 4499c207..82664daa 100644
--- a/application/views/options/oqrs.php
+++ b/application/views/options/oqrs.php
@@ -49,6 +49,15 @@
                             <small id="groupedSearchHelp" class="form-text text-muted"><?php echo lang('options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'); ?></small>
                         </div>
 
+                        <div class="mb-3">
+                            <label for="groupedSearchShowStationName"><?php echo lang('options_grouped_search_show_station_name'); ?></label>
+                            <select name="groupedSearchShowStationName" class="form-select" id="groupedSearchShowStationName">
+                                <option value="off" <?php if($this->optionslib->get_option('groupedSearchShowStationName') == "off") { echo "selected=\"selected\""; } ?>>Off</option>
+                                <option value="on" <?php if($this->optionslib->get_option('groupedSearchShowStationName') == "on") { echo "selected=\"selected\""; } ?>>On</option>
+                            </select>
+                            <small id="groupedSearchShowStationNameHelp" class="form-text text-muted"><?php echo lang('options_grouped_search_show_station_name_hint'); ?></small>
+                        </div>
+
                         <!-- Save the Form -->
                         <input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
                     </form>
diff --git a/application/views/oqrs/index.php b/application/views/oqrs/index.php
index 5d0ed50a..d4e20564 100644
--- a/application/views/oqrs/index.php
+++ b/application/views/oqrs/index.php
@@ -19,7 +19,7 @@
 		}
 		if ($groupedSearch == 'on') {
 			echo 'This search will search in all station locations where OQRS is active.<br /><br /><form class="d-flex align-items-center" onsubmit="return false;"><label class="my-1 me-2" for="oqrssearch">Enter your callsign: </label>
-			<input class="form-control me-sm-2" id="oqrssearch" type="search" name="callsign" placeholder="Search Callsign" aria-label="Search" required="required">
+			<input class="form-control me-sm-2 w-auto" id="oqrssearch" type="search" name="callsign" placeholder="Search Callsign" aria-label="Search" required="required">
 			<button onclick="searchOqrsGrouped();" class="btn btn-sm btn-primary" id="stationbuttonsubmit" type="button"><i class="fas fa-search"></i> Search</button>
 			</form>';
 			echo '<div class="searchinfo"></div>';
diff --git a/application/views/oqrs/request_grouped.php b/application/views/oqrs/request_grouped.php
index b110706f..62330269 100644
--- a/application/views/oqrs/request_grouped.php
+++ b/application/views/oqrs/request_grouped.php
@@ -10,7 +10,11 @@ The following QSO(s) were found. Please fill out the date and time and submit yo
             <th class="center"><span class="larger_font band">Band</th>
             <th class="center">Mode</th>
             <th class="center">Callsign</th>
-            <th class="center">Name</th>
+            <?php
+            $showStationName = $this->optionslib->get_option('groupedSearchShowStationName');
+            if ($showStationName == 'on'): ?>
+                <th class="center">Station Name</th>
+            <?php endif; ?>
         </tr>
     </thead>
     <tbody>
@@ -24,7 +28,10 @@ The following QSO(s) were found. Please fill out the date and time and submit yo
                     echo '<td id="band">'. $qso->col_band .'</td>';
                     echo '<td id="mode">'; echo $qso->col_submode == null ? strtoupper($qso->col_mode) : strtoupper($qso->col_submode);  echo '</td>';      
                     echo '<td>'. $qso->station_callsign .'</td>';
-                    echo '<td>'. $qso->station_profile_name .'</td>';
+                    $showStationName = $this->optionslib->get_option('groupedSearchShowStationName');
+                    if ($showStationName == 'on'):
+                        echo '<td>'. $qso->station_profile_name .'</td>';
+                    endif;
                 echo '</tr>';
             }
         ?>