diff --git a/lib/Froxlor/UI/Linker.php b/lib/Froxlor/UI/Linker.php
index 5996df12..a1b2a184 100644
--- a/lib/Froxlor/UI/Linker.php
+++ b/lib/Froxlor/UI/Linker.php
@@ -163,7 +163,7 @@ class Linker
 			}
 
 			// Encode parameters and add them to the link
-			$link .= urlencode($key) . '=' . urlencode($value);
+			$link .= urlencode($key) . (!empty($value) ? '=' . urlencode($value) : '');
 		}
 
 		// Reset our class for further use
diff --git a/lib/tablelisting/customer/tablelisting.domains.php b/lib/tablelisting/customer/tablelisting.domains.php
index 364e6fcc..ecbd36b9 100644
--- a/lib/tablelisting/customer/tablelisting.domains.php
+++ b/lib/tablelisting/customer/tablelisting.domains.php
@@ -93,7 +93,7 @@ return [
 					'section' => 'domains',
 					'page' => 'domains',
 					'searchfield' => 'd.aliasdomain',
-					'searchtext' => ':id'
+					'searchtext' => ':domainaliasid'
 				],
 				'visible' => [Domain::class, 'canEditAlias']
 			],