diff --git a/include/functions.php b/include/functions.php
index 7d10a73..bea630c 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -247,7 +247,7 @@ function getMMDVMLog() {
    // Open Logfile and copy loglines into LogLines-Array()
    $logPath    = MMDVMLOGPATH."/".MMDVMLOGPREFIX."-".date("Y-m-d").".log";
    //$logLines   = explode("\n", `egrep -h "from|end|watchdog|lost|POCSAG" $logPath`);
-   $logLines   = explode("\n", `egrep -h "from|watchdog|lost|POCSAG" $logPath`);
+   $logLines   = explode("\n", `egrep -h "from|end|watchdog|lost|POCSAG" $logPath`);
    return $logLines;
 }
 
@@ -593,18 +593,26 @@ function getHeardList($logLines, $onlyLast) {
       if ( strlen($callsign) < 11 ) {
          $name = "";
          if (defined("ENABLEXTDLOOKUP")) {
-            array_push($heardList, array(convertTimezone($timestamp), $mode, $callsign, $name, $id, $target, $source, $duration, $loss, $ber, $rssi, $alias));
+            if (getEnabled("D-Star", $mmdvmconfigs) == 1) {
+               array_push($heardList, array(convertTimezone($timestamp), $mode, $callsign, $name, $id, $target, $source, $duration, $loss, $ber, $rssi, $alias));
+            } else {
+               array_push($heardList, array(convertTimezone($timestamp), $mode, $callsign, $name, $target, $source, $duration, $loss, $ber, $rssi, $alias));
+            }
             $alias = "";
          } else {
-            array_push($heardList, array(convertTimezone($timestamp), $mode, $callsign, $id, $target, $source, $duration, $loss, $ber, $rssi, $alias));
+            if (getEnabled("D-Star", $mmdvmconfigs) == 1) {
+               array_push($heardList, array(convertTimezone($timestamp), $mode, $callsign, $id, $target, $source, $duration, $loss, $ber, $rssi, $alias));
+            } else {
+               array_push($heardList, array(convertTimezone($timestamp), $mode, $callsign, $target, $source, $duration, $loss, $ber, $rssi, $alias));
+            }
             $alias = "";
-         }/*
+         }
          $duration   = "";
          $loss       = "";
          $ber        = "";
          $rssi       = "";
          $ts1alias   = "---";
-         $ts2alias   = "---";*/
+         $ts2alias   = "---";
          if ($onlyLast && count($heardList )> 20) {
             return $heardList;
          }
diff --git a/include/lh_ajax.php b/include/lh_ajax.php
index d22f52b..2589cdc 100644
--- a/include/lh_ajax.php
+++ b/include/lh_ajax.php
@@ -29,8 +29,12 @@ exec("wc -l ".DMRIDDATPATH." | cut -f1 -d' '", $output2);
       <th><?php echo _("Name"); ?></th>
       <?php
       }
+      if (getEnabled("D-Star", $mmdvmconfigs) == 1) {
       ?>
       <th><?php echo _("DSTAR-ID"); ?></th>
+      <?php
+      }
+      ?>
       <th><?php echo _("Target"); ?></th>
       <th><?php echo _("Source"); ?></th>
       <th><?php echo _("Dur (s)"); ?></th>
diff --git a/include/localtx_ajax.php b/include/localtx_ajax.php
index 24a1a33..1892d50 100644
--- a/include/localtx_ajax.php
+++ b/include/localtx_ajax.php
@@ -19,8 +19,12 @@ $totalLH = count($lastHeard);
       <th><?php echo _("Name"); ?></th>
       <?php
       }
+      if (getEnabled("D-Star", $mmdvmconfigs) == 1) {
       ?>
       <th><?php echo _("DSTAR-ID"); ?></th>
+      <?php
+      }
+      ?>
       <th><?php echo _("Target"); ?></th>
       <th><?php echo _("Source"); ?></th>
       <th><?php echo _("Dur (s)"); ?></th>
diff --git a/include/txinfo.php b/include/txinfo.php
index b02098d..650bb5d 100644
--- a/include/txinfo.php
+++ b/include/txinfo.php
@@ -21,8 +21,12 @@
       <th><?php echo _("Talker Alias"); ?></th>
       <?php
       }
+      if (getEnabled("D-Star", $mmdvmconfigs) == 1) {
       ?>
       <th><?php echo _("DSTAR-ID"); ?></th>
+      <?php
+      }
+      ?>
       <th><?php echo _("Target"); ?></th>
       <th><?php echo _("Source"); ?></th>
       <th><?php echo _("TX-Time"); ?></th>
diff --git a/txinfo.php b/txinfo.php
index 72ea550..f36d7db 100644
--- a/txinfo.php
+++ b/txinfo.php
@@ -26,26 +26,42 @@ foreach ($lastHeard as $listElem) {
 //   echo"<!--";
 //   var_dump($listElem);
 //   echo"-->";
-   if (defined("ENABLEXTDLOOKUP") && $listElem[7] == null && $listElem[1] != "POCSAG" || !defined("ENABLEXTDLOOKUP") && $listElem[6] == null && $listElem[1] != "POCSAG" ) {
+   if (getEnabled("D-Star", $mmdvmconfigs) == 1 && defined("ENABLEXTDLOOKUP") && $listElem[7] == null && $listElem[1] != "POCSAG" || !defined("ENABLEXTDLOOKUP") && $listElem[6] == null && $listElem[1] != "POCSAG"  || \
+   getEnabled("D-Star", $mmdvmconfigs) == 0 && defined("ENABLEXTDLOOKUP") && $listElem[6] == null && $listElem[1] != "POCSAG" || !defined("ENABLEXTDLOOKUP") && $listElem[5] == null && $listElem[1] != "POCSAG" ) {
       echo "<tr>";
       echo"<td nowrap>$listElem[0]</td>";
       echo"<td nowrap>$listElem[1]</td>";
       echo"<td nowrap>$listElem[2]</td>";
       if (defined("ENABLEXTDLOOKUP")) {
          echo"<td nowrap>$listElem[3]</td>";
-         if (defined("TALKERALIAS"))
-           echo"<td nowrap>$listElem[11]</td>";
-         echo"<td nowrap>$listElem[4]</td>";
-         echo"<td nowrap>$listElem[5]</td>";
-         if ($listElem[6] == "RF"){
-            echo "<td nowrap><span class=\"badge badge-success\">RF</span></td>";
-         }else{
-            echo"<td nowrap>$listElem[6]</td>";
+         if (getEnabled("D-Star", $mmdvmconfigs) == 1) {
+            if (defined("TALKERALIAS"))
+              echo"<td nowrap>$listElem[11]</td>";
+            echo"<td nowrap>$listElem[4]</td>";
+            echo"<td nowrap>$listElem[5]</td>";
+            if ($listElem[6] == "RF"){
+               echo "<td nowrap><span class=\"badge badge-success\">RF</span></td>";
+            }else{
+               echo"<td nowrap>$listElem[6]</td>";
+            }
+            $d1     = new DateTime($listElem[0], new DateTimeZone(TIMEZONE));
+            $d2     = new DateTime('now', new DateTimeZone(TIMEZONE));
+            $diff   = $d2->getTimestamp() - $d1->getTimestamp();
+            echo"<td nowrap>$diff s</td>";
+         } else {
+            if (defined("TALKERALIAS"))
+              echo"<td nowrap>$listElem[10]</td>";
+            echo"<td nowrap>$listElem[4]</td>";
+            if ($listElem[5] == "RF"){
+               echo "<td nowrap><span class=\"badge badge-success\">RF</span></td>";
+            }else{
+               echo"<td nowrap>$listElem[5]</td>";
+            }
+            $d1     = new DateTime($listElem[0], new DateTimeZone(TIMEZONE));
+            $d2     = new DateTime('now', new DateTimeZone(TIMEZONE));
+            $diff   = $d2->getTimestamp() - $d1->getTimestamp();
+            echo"<td nowrap>$diff s</td>";
          }
-         $d1     = new DateTime($listElem[0], new DateTimeZone(TIMEZONE));
-         $d2     = new DateTime('now', new DateTimeZone(TIMEZONE));
-         $diff   = $d2->getTimestamp() - $d1->getTimestamp();
-         echo"<td nowrap>$diff s</td>";
       } else {
       	 if (defined("TALKERALIAS"))
            echo"<td nowrap>$listElem[10]</td>";
diff --git a/version.php b/version.php
index f7c4466..0be8cf7 100644
--- a/version.php
+++ b/version.php
@@ -1,3 +1,3 @@
 <?php
-define("VERSION", "20201029-1 (".getGitVersion().")");
+define("VERSION", "20201030-1 (".getGitVersion().")");
 ?>