diff --git a/application/config/cloudlog.php b/application/config/cloudlog.php
index af71ecfe..be642888 100644
--- a/application/config/cloudlog.php
+++ b/application/config/cloudlog.php
@@ -73,4 +73,6 @@ $config['cat_timeout_interval'] = 300;
 |
 */
 
-$config['public_search'] = FALSE;
\ No newline at end of file
+$config['public_search'] = FALSE;
+
+$config['callsign_tags'] = TRUE;
\ No newline at end of file
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index b002163f..cb8d4a2c 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -422,12 +422,16 @@ class Logbook_model extends CI_Model {
   }
 
   function get_qsos($num, $offset) {
-    $this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME, COL_GRIDSQUARE, COL_QSL_RCVD, COL_EQSL_QSL_RCVD, COL_EQSL_QSL_SENT, COL_QSL_SENT, COL_STX, COL_STX_STRING, COL_SRX, COL_SRX_STRING, COL_OPERATOR, COL_STATION_CALLSIGN, COL_LOTW_QSL_SENT, COL_LOTW_QSL_RCVD, COL_VUCC_GRIDS');
-    $this->db->order_by("COL_TIME_ON", "desc");
+    $this->db->select(''.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_RST_RCVD, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_NAME, '.$this->config->item('table_name').'.COL_COUNTRY, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_GRIDSQUARE, '.$this->config->item('table_name').'.COL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_SENT, '.$this->config->item('table_name').'.COL_QSL_SENT, '.$this->config->item('table_name').'.COL_STX, '.$this->config->item('table_name').'.COL_STX_STRING, '.$this->config->item('table_name').'.COL_SRX, '.$this->config->item('table_name').'.COL_SRX_STRING, '.$this->config->item('table_name').'.COL_LOTW_QSL_SENT, '.$this->config->item('table_name').'.COL_LOTW_QSL_RCVD, '.$this->config->item('table_name').'.COL_VUCC_GRIDS, station_profile.*');
+    $this->db->from($this->config->item('table_name'));
 
-    $query = $this->db->get($this->config->item('table_name'), $num, $offset);
+    $this->db->join('station_profile', 'station_profile.station_id = TABLE_HRD_CONTACTS_V01.station_id');
+    $this->db->order_by(''.$this->config->item('table_name').'.COL_TIME_ON', "desc");
 
-    return $query;
+    $this->db->limit($num);
+    $this->db->offset($offset);
+
+    return $this->db->get();
   }
 
   function get_clublog_qsos(){
diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php
index 113de672..dc6c2c93 100644
--- a/application/views/view_log/partial/log.php
+++ b/application/views/view_log/partial/log.php
@@ -19,6 +19,7 @@
 			<?php if($this->session->userdata('user_lotw_name') != "") { ?>
 			<td>LoTW</td>
 			<?php } ?>
+			<td>Station</td>
 			<td></td>
 			<?php } ?>
 		</tr>
@@ -61,6 +62,14 @@
 			</td>
 			<?php } ?>
 
+			<?php if($this->config->item('callsign_tags') == true) { ?>
+				<?php if($row->station_callsign	 != null) { ?>
+				<td>
+					<span class="badge badge-light"><?php echo $row->station_callsign; ?></span>
+				</td>
+				<?php } ?>
+			<?php } ?>
+
 			<td>
 				<div class="dropdown">
 				  <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -83,13 +92,6 @@
 				  </div>
 				</div>
 			</td>
-			<?php if($this->config->item('callsign_tags') == true) { ?>
-				<?php if($row->COL_STATION_CALLSIGN	 != null) { ?>
-				<td><span class="label notice"><?php echo $row->COL_STATION_CALLSIGN; ?></span></td>
-				<?php } elseif($row->COL_OPERATOR != null) { ?>
-				<td><span class="label notice"><?php echo $row->COL_OPERATOR; ?></span></td>
-				<?php } ?>
-			<?php } ?>
 			<?php } ?>
 		</tr>
 		<?php $i++; } ?>