diff --git a/common_config.php b/common_config.php
index 20fbce8..84cc3b6 100644
--- a/common_config.php
+++ b/common_config.php
@@ -38,7 +38,7 @@ const REQUIRE_APPROVAL = false; // require admin approval of new sites? true/fal
 const CANONICAL_URL = 'https://onions.danwin1210.me'; // our preferred domain for search engines
 //Categories - new links will always be put into the first one, leave it to Unsorted
 //once configured, only add new categories at the end or you have to manually adjust the database.
-$categories=['Unsorted', 'Adult/Porn', 'Communication/Social', 'Forums', 'Hacking/Programming/Software', 'Hosting', 'Libraries/Wikis', 'Link Lists', 'Market/Shop/Store', 'Other', 'Personal Sites/Blogs', 'Security/Privacy/Encryption', 'Whistleblowing', 'Empty/Error/Unknown', 'Cryptocurrencies', 'Scams', 'Fun/Games/Joke', 'Search', 'Autodetected scam (unchecked)'];
+$categories=['Unsorted', 'Adult/Porn', 'Communication/Social', 'Forums', 'Hacking/Programming/Software', 'Hosting', 'Libraries/Wikis', 'Link Lists', 'Market/Shop/Store', 'Other', 'Personal Sites/Blogs', 'Security/Privacy/Encryption', 'Whistleblowing', 'Empty/Error/Unknown', 'Cryptocurrencies', 'Scams', 'Fun/Games/Joke', 'Search'];
 
 // Language selection
 $I = $T = [];
diff --git a/cron/phishing_tests.php b/cron/phishing_tests.php
index 99d5e40..2a70549 100644
--- a/cron/phishing_tests.php
+++ b/cron/phishing_tests.php
@@ -12,7 +12,7 @@ set_curl_options($ch);
 
 //check('http://tt3j2x4k5ycaa5zt.onion/onions.php?cat=15&pg=0', 'http://tt3j277rncfaqmj7.onion/onions.php?cat=15&pg=0');
 //check('http://skunksworkedp2cg.onion/sites.html', 'http://skunkrdunsylcfqd.onion/sites.html');
-check('http://dhosting4xxoydyaivckq7tsmtgi4wfs3flpeyitekkmqwu4v4r46syd.onion/list.php', 'http://dhostingwwafxyuaxhs6bkhzo5e2mueztbmhqe6wsng547ucvzfuh2ad.onion/list.php');
+//check('http://dhosting4xxoydyaivckq7tsmtgi4wfs3flpeyitekkmqwu4v4r46syd.onion/list.php', 'http://dhostingwwafxyuaxhs6bkhzo5e2mueztbmhqe6wsng547ucvzfuh2ad.onion/list.php');
 
 function check(string $link, string $phishing_link){
 	global $ch, $db;
diff --git a/cron/tests.php b/cron/tests.php
index 7239b73..f5d6a51 100644
--- a/cron/tests.php
+++ b/cron/tests.php
@@ -53,12 +53,12 @@ foreach($curl_handles as $handle){
 		$header = substr($content, 0, $header_size);
 		$content = substr($content, $header_size);
 		// update description to title, if not yet set
-		if(($onion['description']==='' || $onion['description']==='Site hosted by Daniel\'s hosting service') && preg_match('~<title>([^<]+)</title>~i', $content, $match)){
+		if(in_array($onion['description'], ['', 'Site hosted by Daniel\'s hosting service', ' - SCAM']) && preg_match('~<title>([^<]+)</title>~i', $content, $match)){
 			$desc=preg_replace("/(\r?\n|\r\n?)/", '<br>', htmlspecialchars(html_entity_decode(trim($match[1]))));
 			if($desc!=='Site hosted by Daniel\'s hosting service'){
-				$desc_online_stmt->execute([$desc, $onion['md5sum'], $time]);
+				$desc_online_stmt->execute([$desc, $time, $onion['md5sum']]);
 			}else{
-				$desc_empty_stmt->execute([$desc, $onion['md5sum'], $time]);
+				$desc_empty_stmt->execute([$desc, $time, $onion['md5sum']]);
 			}
 		}
 		$online_stmt->execute([$time, $onion['md5sum']]);
diff --git a/cron/update.php b/cron/update.php
index 135cd18..f5e3176 100644
--- a/cron/update.php
+++ b/cron/update.php
@@ -13,19 +13,18 @@ $onions=[];
 $scanned_onions=[];
 
 //sources to get links from
-check_links($onions, $ch, 'http://q3lgwxinynjxkor6wghr6hrhlix7fquja3t25phbagqizkpju36fwdyd.onion/list.php');
 check_links($onions, $ch, 'https://tt3j2x4k5ycaa5zt.onion.link/antanistaticmap/stats/yesterday');
-check_links($onions, $ch, 'https://tt3j2x4k5ycaa5zt.onion.sh/antanistaticmap/stats/yesterday');
 check_links($onions, $ch, 'https://tt3j2x4k5ycaa5zt.tor2web.io/antanistaticmap/stats/yesterday');
 check_links($onions, $ch, 'http://visitorfi5kl7q7i.onion/address/');
-check_links($onions, $ch, 'http://dhosting4xxoydyaivckq7tsmtgi4wfs3flpeyitekkmqwu4v4r46syd.onion/list.php');
-check_links($onions, $ch, 'http://3bbaaaccczcbdddz.onion/discover');
-check_links($onions, $ch, 'http://tor66sezptuu2nta.onion/fresh');
+check_links($onions, $ch, 'http://3bbad7fauom4d6sgppalyqddsqbf5u5p56b5k5uk2zxsy3d6ey2jobad.onion/discover');
+check_links($onions, $ch, 'http://tor66sewebgixwhcqfnp5inzp5x5uohhdy3kvtnyfxc2e5mxiuh34iid.onion/fresh');
 check_links($onions, $ch, 'https://crt.sh/?q=.onion&exclude=expired&deduplicate=Y');
-check_links($onions, $ch, 'http://darkeyeb643f2syd.onion/');
-check_links($onions, $ch, 'http://darktorhvabc652txfc575oendhykqcllb7bh7jhhsjduocdlyzdbmqd.onion/hidden-wiki-onion-deepweb-tor-links-darknet.html');
-check_links($onions, $ch, 'http://vladhz5tmikfgxzfa2nk7nxah7x5msa5z5ygb75xb5nsizmeht2dazyd.onion/list.php');
-check_links($onions, $ch, 'http://raptortiabg7uyez.onion/');
+check_links($onions, $ch, 'http://darkeyepxw7cuu2cppnjlgqaav6j42gyt43clcn4vjjf7llfyly5cxid.onion/');
+check_links($onions, $ch, 'http://raptora2y6r3bxmjcd3xglr3tcakc6ezq3omyzbnvwahhpi27l3w4yad.onion/');
+check_links($onions, $ch, 'http://darkeyepxw7cuu2cppnjlgqaav6j42gyt43clcn4vjjf7llfyly5cxid.onion/');
+check_links($onions, $ch, 'https://onionlandsearchengine.com/discover');
+check_links($onions, $ch, 'https://godnotaba.fun/');
+check_links($onions, $ch, 'http://links.communzyxz3qfpum5tnvrfvvrr4jlosbq4mzeskigoionqqdylmlhmid.onion/?format=text');
 
 //add them to the database
 add_onions($onions, $db);
diff --git a/lang_de.php b/lang_de.php
index 59358e1..9299de9 100644
--- a/lang_de.php
+++ b/lang_de.php
@@ -1,6 +1,7 @@
 <?php
 $T=[
 	'all'		=>	'Alle',
+	'all_legitimate'=>	'Alle legitimen',
 	'lastadded'	=>	'Zuletzt hinzugefügt',
 	'offline'	=>	'Offline > 1 Woche',
 	'removed'	=>	'Entfernt/Kinderporno',
diff --git a/lang_en.php b/lang_en.php
index 6cd8b8e..a674d7e 100644
--- a/lang_en.php
+++ b/lang_en.php
@@ -1,6 +1,7 @@
 <?php
 $I=[
 	'all'		=>	'All',
+	'all_legitimate'=>	'All legitimate',
 	'lastadded'	=>	'Last added',
 	'offline'	=>	'Offline > 1 week',
 	'removed'	=>	'Removed/Child porn',
diff --git a/www/onions.php b/www/onions.php
index 1fee6b1..529ff70 100644
--- a/www/onions.php
+++ b/www/onions.php
@@ -51,7 +51,7 @@ function send_html(){
 	asort($categories);
 	//sql for special categories
 	$special=[
-		$I['all']=>"address!='' AND category!=15 AND id NOT IN (SELECT onion_id FROM " . PREFIX . 'phishing) AND timediff<604800',
+		$I['all_legitimate']=>"address!='' AND category!=15 AND id NOT IN (SELECT onion_id FROM " . PREFIX . 'phishing) AND timediff<604800',
 		$I['lastadded']=>"address!='' AND id NOT IN (SELECT onion_id FROM " . PREFIX . 'phishing)',
 		$I['offline']=>"address!='' AND id NOT IN (SELECT onion_id FROM " . PREFIX . 'phishing) AND timediff>604800'
 	];
@@ -173,7 +173,7 @@ function send_html(){
 	echo "<input type=\"hidden\" name=\"lang\" value=\"$language\">";
 	echo "<p><label>$I[search]: <br><input name=\"q\" size=\"30\" placeholder=\"$I[searchterm]\" value=\"";
 	if(isset($_REQUEST['q'])){
-		echo htmlspecialchars($_REQUEST['q']);
+		echo trim(str_replace(['http://', 'https://', '.onion', '/'], '', htmlspecialchars($_REQUEST['q'])));
 	}
 	echo '"></label></p>';
 	echo "<p><label>$I[category]: <select name=\"cat\">";
@@ -294,7 +294,7 @@ function send_html(){
 		$pagination='';
 	}
 	if(isset($_REQUEST['q'])){//run search query
-		$query=htmlspecialchars($_REQUEST['q']);
+		$query=trim(str_replace(['http://', 'https://', '.onion', '/'], '', htmlspecialchars($_REQUEST['q'])));
 		$query="%$query%";
 		if(isset($_REQUEST['hidelocked'])){
 			$hidelocked='AND locked=0';
@@ -309,7 +309,7 @@ function send_html(){
 			$stmt->execute([$category, $query, $query]);
 		}
 		$table=get_table($stmt, $numrows);
-		printf("<p><b>$I[searchresult]</b></p>", $_REQUEST['q'], $numrows);
+		printf("<p><b>$I[searchresult]</b></p>", trim(str_replace(['http://', 'https://', '.onion', '/'], '', htmlspecialchars($_REQUEST['q']))), $numrows);
 		echo $table;
 	}elseif($category>=count($categories)+count($special)){//show phishing clones
 		print_phishing_table();
@@ -486,9 +486,9 @@ function get_pagination(int $category, int $pages) : string {
 	ob_start();
 	echo "<ul class=\"list pagination\"><li>$I[pages]:</li>";
 	if($_REQUEST['pg']==0){
-		echo " <li class=\"active\"><a href=\"?cat=$category&amp;pg=0&amp;lang=$language\" target=\"_self\">$I[all]</a></li>";
+		echo " <li class=\"active\"><a href=\"?cat=$category&amp;pg=0&amp;lang=$language\" target=\"_self\">$I[all_legitimate]</a></li>";
 	}else{
-		echo " <li><a href=\"?cat=$category&amp;pg=0&amp;lang=$language\" target=\"_self\">$I[all]</a></li>";
+		echo " <li><a href=\"?cat=$category&amp;pg=0&amp;lang=$language\" target=\"_self\">$I[all_legitimate]</a></li>";
 	}
 	for($i=1; $i<=$pages; ++$i){
 		if($_REQUEST['pg']==$i){