diff --git a/ajax.php b/ajax.php
index 3f96fe1..386af60 100644
--- a/ajax.php
+++ b/ajax.php
@@ -26,19 +26,31 @@ if ($_GET['section'] == "localTx") {
 		if (defined("ENABLEXTDLOOKUP")) {
 			if ($listElem[6] == "RF" && ($listElem[1]=="D-Star" || startsWith($listElem[1], "DMR") || $listElem[1]=="YSF" || $listElem[1]=="P25")) {
 				$listElem[3] = getName($listElem[2]);
-				if (constant("SHOWQRZ") && $listElem[2] !== "??????????" && !is_numeric($listElem[2])) {
-					$listElem[2] = "<a target=\"_new\" href=\"https://qrz.com/db/$listElem[2]\">".str_replace("0","&Oslash;",$listElem[2])."</a>";
-				} else {
-					$listElem[2] = "<a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?usrid=$listElem[2]\">".$listElem[2]."</a>";
+				if ($listElem[2] !== "??????????") {
+					if (!is_numeric($listElem[2])) {
+						if (constant("SHOWQRZ")) {
+							$listElem[2] = "<a target=\"_new\" href=\"https://qrz.com/db/$listElem[2]\">".str_replace("0","&Oslash;",$listElem[2])."</a>";
+						} else {
+							$listElem[2] = "<a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?callsign=$listElem[2]\">".$listElem[2]."</a>";
+						}
+					} else {
+						$listElem[2] = "<a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?usrid=$listElem[2]\">".$listElem[2]."</a>";
+					}
 				}
 				array_push($lastHeard, $listElem);
 			}
 		} else {
 			if ($listElem[5] == "RF" && ($listElem[1]=="D-Star" || startsWith($listElem[1], "DMR") || $listElem[1]=="YSF" || $listElem[1]=="P25")) {
-				if (constant("SHOWQRZ") && $listElem[2] !== "??????????" && !is_numeric($listElem[2])) {
-					$listElem[2] = "<a target=\"_new\" href=\"https://qrz.com/db/$listElem[2]\">".str_replace("0","&Oslash;",$listElem[2])."</a>";
-				} else {
-					$listElem[2] = "<a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?usrid=$listElem[2]\">".$listElem[2]."</a>";
+				if ($listElem[2] !== "??????????") {
+					if (!is_numeric($listElem[2])) {
+						if (constant("SHOWQRZ")) {
+							$listElem[2] = "<a target=\"_new\" href=\"https://qrz.com/db/$listElem[2]\">".str_replace("0","&Oslash;",$listElem[2])."</a>";
+						} else {
+							$listElem[2] = "<a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?callsign=$listElem[2]\">".$listElem[2]."</a>";
+						}
+					} else {
+						$listElem[2] = "<a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?usrid=$listElem[2]\">".$listElem[2]."</a>";
+					}
 				}
 				array_push($lastHeard, $listElem);
 			}
@@ -220,4 +232,4 @@ if ($_GET['section'] == "sysinfo") {
 			</tbody>
 <?php
 }
-?>
\ No newline at end of file
+?>
diff --git a/include/functions.php b/include/functions.php
index 87a4d53..8002d92 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -360,12 +360,17 @@ function getLastHeard($logLines, $onlyLast) {
 						$listElem[3] = "---";
 					}
 				}
-				if (constant("SHOWQRZ") && $listElem[2] !== "??????????" && !is_numeric($listElem[2])) {
-					$listElem[2] = "<a target=\"_new\" href=\"https://qrz.com/db/$listElem[2]\">".str_replace("0","&Oslash;",$listElem[2])."</a>";
-				} else {
-					$listElem[2] = "<a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?usrid=$listElem[2]\">".$listElem[2]."</a>";
+				if ($listElem[2] !== "??????????") {
+					if (!is_numeric($listElem[2])) {
+						if (constant("SHOWQRZ")) {
+							$listElem[2] = "<a target=\"_new\" href=\"https://qrz.com/db/$listElem[2]\">".str_replace("0","&Oslash;",$listElem[2])."</a>";
+						} else {
+							$listElem[2] = "<a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?callsign=$listElem[2]\">".$listElem[2]."</a>";
+						}
+					} else {
+						$listElem[2] = "<a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?usrid=$listElem[2]\">".$listElem[2]."</a>";
+					}
 				}
-				
 				array_push($lastHeard, $listElem);
 				$counter++;
 			}
diff --git a/include/lh.php b/include/lh.php
index 3206e25..55e723c 100644
--- a/include/lh.php
+++ b/include/lh.php
@@ -34,10 +34,16 @@ for ($i = 0;  ($i < $totalLH); $i++) {
 		echo"<tr>";
 		echo"<td nowrap>$listElem[0]</td>";
 		echo"<td nowrap>$listElem[1]</td>";
-		if (constant("SHOWQRZ") && $listElem[2] !== "??????????" && !is_numeric($listElem[2])) {
-			echo"<td nowrap><a target=\"_new\" href=\"https://qrz.com/db/$listElem[2]\">".str_replace("0","&Oslash;",$listElem[2])."</a></td>";
-		} else {
-			echo"<td nowrap><a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?usrid=$listElem[2]\">".$listElem[2]."</td>";
+		if ($listElem[2] !== "??????????") {
+			if (!is_numeric($listElem[2])) {
+				if (constant("SHOWQRZ")) {
+					echo"<td nowrap><a target=\"_new\" href=\"https://qrz.com/db/$listElem[2]\">".str_replace("0","&Oslash;",$listElem[2])."</a></td>";
+				} else {
+					echo"<td nowrap><a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?callsign=$listElem[2]\">".$listElem[2]."</td>";
+				}
+			} else {
+				echo"<td nowrap><a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?usrid=$listElem[2]\">".$listElem[2]."</td>";
+			}
 		}
 		if (defined("ENABLEXTDLOOKUP")) {
 			echo "<td nowrap>".getName($listElem[2])."</td>";
diff --git a/include/localtx.php b/include/localtx.php
index 5fa49f2..2f1d6f5 100644
--- a/include/localtx.php
+++ b/include/localtx.php
@@ -38,10 +38,16 @@ for ($i = 0; $i < count($localTXList); $i++) {
 		echo"<tr>";
 		echo"<td nowrap>$listElem[0]</td>";
 		echo"<td nowrap>$listElem[1]</td>";
-		if (constant("SHOWQRZ") && $listElem[2] !== "??????????" && !is_numeric($listElem[2])) {
-			echo"<td nowrap><a target=\"_new\" href=\"https://qrz.com/db/$listElem[2]\">".str_replace("0","&Oslash;",$listElem[2])."</a></td>";
-		} else {
-			echo"<td nowrap><a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?usrid=$listElem[2]\">".$listElem[2]."</td>";
+		if ($listElem[2] !== "??????????") {
+			if (!is_numeric($listElem[2])) {
+				if (constant("SHOWQRZ")) {
+					echo"<td nowrap><a target=\"_new\" href=\"https://qrz.com/db/$listElem[2]\">".str_replace("0","&Oslash;",$listElem[2])."</a></td>";
+				} else {
+					echo"<td nowrap><a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?callsign=$listElem[2]\">".$listElem[2]."</td>";
+				}
+			} else {
+				echo"<td nowrap><a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?usrid=$listElem[2]\">".$listElem[2]."</td>";
+			}
 		}
 		if (defined("ENABLEXTDLOOKUP")) {
 			echo "<td class=\"nowrap\">$listElem[3]</td>";
diff --git a/txinfo.php b/txinfo.php
index aa987f3..526fef8 100644
--- a/txinfo.php
+++ b/txinfo.php
@@ -19,10 +19,16 @@ foreach ($lastHeard as $listElem) {
 		echo "<tr>";
 		echo"<td nowrap>$listElem[0]</td>";
 		echo"<td nowrap>$listElem[1]</td>";
-		/*if (constant("SHOWQRZ") && $listElem[2] !== "??????????" && !is_numeric($listElem[2])) {
-			echo"<td nowrap><a target=\"_new\" href=\"https://qrz.com/db/$listElem[2]\">".str_replace("0","&Oslash;",$listElem[2])."</a></td>";
-		} else {
-			echo"<td nowrap><a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?usrid=$listElem[2]\">".$listElem[2]."</td>";
+		/*if ($listElem[2] !== "??????????") {
+			if (!is_numeric($listElem[2])) {
+				if (constant("SHOWQRZ")) {
+					echo"<td nowrap><a target=\"_new\" href=\"https://qrz.com/db/$listElem[2]\">".str_replace("0","&Oslash;",$listElem[2])."</a></td>";
+				} else {
+					echo"<td nowrap><a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?callsign=$listElem[2]\">".$listElem[2]."</td>";
+				}
+			} else {
+				echo"<td nowrap><a target=\"_new\" href=\"http://dmr.darc.de/dmr-userreg.php?usrid=$listElem[2]\">".$listElem[2]."</td>";
+			}
 		}*/
 		echo"<td nowrap>$listElem[2]</td>";