X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/54ab72a939e5bb83edc50244c5918223629f9085..acc0a00b08e482fa21690b52881707ce0498ce2c:/website/search.php

diff --git a/website/search.php b/website/search.php
index dbb36404..a6e94f5e 100755
--- a/website/search.php
+++ b/website/search.php
@@ -432,7 +432,7 @@
 				{
 					$aValidTokens[$aToken['word_token']] = array($aToken);
 				}
-				if ($aToken['word_token'][0]==' ' && !$aToken['class'] && !$aToken['country_code']) $aPossibleMainWordIDs[$aToken['word_id']] = 1;
+				if (!$aToken['class'] && !$aToken['country_code']) $aPossibleMainWordIDs[$aToken['word_id']] = 1;
 				$aWordFrequencyScores[$aToken['word_id']] = $aToken['search_name_count'] + 1;
 			}
 			if (CONST_Debug) var_Dump($aPhrases, $aValidTokens);
@@ -1532,10 +1532,10 @@
 			$bFirst = false;
 		}
 		if (!$bDeDupe || (!isset($aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']])
-			&& !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['name']])))
+			&& !isset($aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name']])))
 		{
 			$aOSMIDDone[$aResult['osm_type'].$aResult['osm_id']] = true;
-			$aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['name']] = true;
+			$aClassTypeNameDone[$aResult['osm_type'].$aResult['class'].$aResult['type'].$aResult['name']] = true;
 			$aSearchResults[] = $aResult;
 		}