diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index aa27664b..c438659b 100644
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -142,7 +142,7 @@ if (isset($aPolyPoints))
 		if ($sOSMType) echo ', <span class="osm"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aAddressLine['osm_id'].'">'.$aAddressLine['osm_id'].'</a></span>';
 		echo ', <span class="adminlevel">'.$aAddressLine['admin_level'].'</span>';
 		echo ', <span class="rankaddress">'.$aAddressLine['rank_search_label'].'</span>';
-		echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';
+//		echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';
 		echo ', <span class="distance">'.$aAddressLine['distance'].'</span>';
 		echo ' <a href="details.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
 		echo ')';
@@ -150,6 +150,30 @@ if (isset($aPolyPoints))
 	}
 	echo '</div>';
 
+	if ($aLinkedLines)
+	{
+		echo '<h2>Linked Places</h2>';
+		echo '<div class=\"linked\">';
+		foreach($aLinkedLines as $aAddressLine)
+		{	
+			$sOSMType = ($aAddressLine['osm_type'] == 'N'?'node':($aAddressLine['osm_type'] == 'W'?'way':($aAddressLine['osm_type'] == 'R'?'relation':'')));
+
+			echo '<div class="line">';
+			echo '<span class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>').'</span>';
+			echo ' (';
+			echo '<span class="type"><span class="label">Type: </span>'.$aAddressLine['class'].':'.$aAddressLine['type'].'</span>';
+			if ($sOSMType) echo ', <span class="osm"><span class="label"></span>'.$sOSMType.' <a href="http://www.openstreetmap.org/browse/'.$sOSMType.'/'.$aAddressLine['osm_id'].'">'.$aAddressLine['osm_id'].'</a></span>';
+			echo ', <span class="adminlevel">'.$aAddressLine['admin_level'].'</span>';
+			echo ', <span class="rankaddress">'.$aAddressLine['rank_search_label'].'</span>';
+//			echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';
+			echo ', <span class="distance">'.$aAddressLine['distance'].'</span>';
+			echo ' <a href="details.php?place_id='.$aAddressLine['place_id'].'">GOTO</a>';
+			echo ')';
+			echo '</div>';
+		}
+		echo '</div>';
+	}
+
 	if ($aPlaceSearchNameKeywords)
 	{
 		echo '<h2>Name Keywords</h2>';
diff --git a/sql/functions.sql b/sql/functions.sql
index 0174387b..c825712d 100644
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -1481,7 +1481,6 @@ BEGIN
 
         -- mark the linked place (excludes from search results)
         UPDATE placex set linked_place_id = NEW.place_id where place_id = linkedPlacex.place_id;
-        DELETE from search_name where place_id = linkedPlacex.place_id;
 
       END LOOP;
 
@@ -1505,7 +1504,6 @@ BEGIN
 
           -- mark the linked place (excludes from search results)
           UPDATE placex set linked_place_id = NEW.place_id where place_id = linkedPlacex.place_id;
-          DELETE from search_name where place_id = linkedPlacex.place_id;
         END IF;
 
       END LOOP;
@@ -1534,12 +1532,12 @@ BEGIN
 
           -- mark the linked place (excludes from search results)
           UPDATE placex set linked_place_id = NEW.place_id where place_id = linkedPlacex.place_id;
-          DELETE from search_name where place_id = linkedPlacex.place_id;
+
         END LOOP;
       END IF;
 
       IF NEW.centroid IS NOT NULL THEN
-        place_centroid := NEW.centroid
+        place_centroid := NEW.centroid;
       END IF;
 
     END IF;
diff --git a/website/details.php b/website/details.php
index a4cb8b96..7c6ad8ad 100755
--- a/website/details.php
+++ b/website/details.php
@@ -109,12 +109,19 @@
 	// Address
 	$aAddressLines = getAddressDetails($oDB, $sLanguagePrefArraySQL, $iPlaceID, $aPointDetails['country_code'], true);
 
+	// Linked places
+	$sSQL = "select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, st_distance(geometry, placegeometry) as distance, ";
+	$sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength ";
+	$sSQL .= " from placex, (select geometry as placegeometry from placex where place_id = $iPlaceID) as x";
+	$sSQL .= " where linked_place_id = $iPlaceID";
+	$sSQL .= " order by rank_address asc,rank_search asc,get_name_by_language(name,$sLanguagePrefArraySQL),housenumber";
+	$aLinkedLines = $oDB->getAll($sSQL);
+
 	// All places this is an imediate parent of
 	$sSQL = "select placex.place_id, osm_type, osm_id, class, type, housenumber, admin_level, rank_address, ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') as isarea, st_distance(geometry, placegeometry) as distance, ";
 	$sSQL .= " get_name_by_language(name,$sLanguagePrefArraySQL) as localname, length(name::text) as namelength ";
 	$sSQL .= " from placex, (select geometry as placegeometry from placex where place_id = $iPlaceID) as x";
 	$sSQL .= " where parent_place_id = $iPlaceID";
-//	$sSQL .= " and type != 'postcode'";
 	$sSQL .= " order by rank_address asc,rank_search asc,get_name_by_language(name,$sLanguagePrefArraySQL),housenumber";
 	$aParentOfLines = $oDB->getAll($sSQL);
 
diff --git a/website/search.php b/website/search.php
index c00c4cfd..88248cea 100755
--- a/website/search.php
+++ b/website/search.php
@@ -1012,6 +1012,7 @@
 					$sSQL .= "coalesce(importance,0.9-(rank_search::float/30)) as importance ";
 					$sSQL .= "from placex where place_id in ($sPlaceIDs) ";
 					$sSQL .= "and placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
+					$sSQL .= "and linked_place_id is null ";
 					$sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,country_code,importance";
 					if (!$bDeDupe) $sSQL .= ",place_id";
 					$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";